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

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

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