[automerger skipped] Only require RKP on T+ chipsets am: 166d160b78 am: 6cc8f1e039 am: 7f60034c16 -s ours am: ad409fc86a -s ours am: c0009d118b -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: I74452be3bd7d33479a3f8bf1cbaec776f1da0880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>