Merge "Add support for storing upgraded RKP key blobs" am: 6580c85488 am: 927ec5a6d0 am: 85c1718f17

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2364066

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