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

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

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