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

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

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