Merge "Fixing assignment issue from clone()" into sc-dev am: 9d2cfdd61c

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/15060309

Change-Id: I77577c699017f676957e5844df7f87f4a6314fd2