Merge "Do not require StrongBox to implement RKP" am: fc746fb1aa am: d3d5e859f9

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2507901

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