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

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

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