[automerger skipped] Only require RKP on T+ chipsets am: 166d160b am: 6cc8f1e0 -s ours

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

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



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