Merge "Only require RKP on T+ chipsets" into main am: 7bed173e4c am: ba6ec44f84 am: 6bae1ffa05 am: 326dc8de6d

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

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