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

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

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