Merge "Do not cache rkp_only property" am: 4c348bd49f am: fb4ccc3172 am: 2fcd798bc9

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

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