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

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

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