[automerger skipped] Only require RKP on T+ chipsets am: 166d160b78 am: 6cc8f1e039 am: 7f60034c16 am: 7c9a6af71c -s ours am: b74c77bbb6 -s ours

am skip reason: Merged-In I387e5f058ada698747aac103c1745682291f2d1c with SHA-1 166d160b78 is already in history

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

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