Merge "Add support for storing upgraded RKP key blobs" am: 6580c854

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



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