Merge "Ensure that "rkp only" forces checks for rkp keys" am: cd6b6a7ff8 am: f16fb9f3a8

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

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