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

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

Change-Id: I37482708f4c1f8d1a511c8eb753532b63c3ad4cc