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

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

Change-Id: Ie4c03012085e66743e5980d50e2f688eb495b018