[automerged blank] Upgrade remotely provisioned keys if necessary. 2p: ace888ae05

Blank merge reason: Change-Id I5dddc8fa1fe7fe9d7dd559b337089d607fcc735a with SHA-1 55620ff9a8 is in history

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

Bug: 220063191
Change-Id: If7323a91574ee14257504e6ac77eafa770fb1c01
Merged-In: I5dddc8fa1fe7fe9d7dd559b337089d607fcc735a