[automerger skipped] Only require RKP on T+ chipsets am: 166d160b78 am: 6cc8f1e039 -s ours am: 145d343279 -s ours am: 32151bcf00 -s ours am: 96a506ddc9 -s ours

am skip reason: Merged-In I387e5f058ada698747aac103c1745682291f2d1c with SHA-1 8be875e0d0 is already in history

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

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