Snap for 4598635 from 3e02df8d3c to pi-release

Change-Id: Ib38a74630da0771dbcf5a18f371030c68cf0a46e

Keymaster.h

@@ -66,11 +66,15 @@ class KeymasterOperation {
     KeymasterOperation() : mDevice{nullptr}, mOpHandle{0}, mError{km::ErrorCode::UNKNOWN_ERROR} {}
     // Move Assignment
     KeymasterOperation& operator=(KeymasterOperation&& rhs) {
-        mDevice = std::move(rhs.mDevice);
+        mDevice = rhs.mDevice;
-        mOpHandle = std::move(rhs.mOpHandle);
+        rhs.mDevice = nullptr;
-        mError = std::move(rhs.mError);
+
-        rhs.mError = km::ErrorCode::UNKNOWN_ERROR;
+        mOpHandle = rhs.mOpHandle;
         rhs.mOpHandle = 0;
+
+        mError = rhs.mError;
+        rhs.mError = km::ErrorCode::UNKNOWN_ERROR;
+
         return *this;
     }