Merge "Support upgrade key for software-emulated keys." am: 65467fba1f

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2155233

Change-Id: I231789a61c60244bb925a53e90bc7a82d1284135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>