[automerger skipped] Fixing assignment issue from clone() am: 2af6e9e750 am: 5f2527df95 -s ours am: 6687ff84ff -s ours am: 07443e50ef -s ours

am skip reason: Merged-In I6ee5d8bb2a70aeaff53ab23d9ebdbd45a84f2543 with SHA-1 4016b9d644 is already in history

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

Change-Id: I28ea200b0f28c0bc1645cc7bffd690e8ce220bd1