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

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

Change-Id: I28a9fa64a85dd3523b3a07d1aab57a325ade84fc