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

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

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