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

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

Change-Id: I916bef63be428080bea435f01eed2168f7ae7012