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

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

Change-Id: I12c7f04a9e46ca9f18141421fe6ce51bef64661f