Upgrade remotely provisioned keys if necessary. am: 55620ff9a8 am: 350fe49afe

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

Change-Id: I521a9d8a591a3f449ec62199a22867bd6bdf891f