[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ea4fae56a0 -s ours am: 76995ad0f4 -s ours am: 7a4a6a0608 -s ours

am skip reason: Merged-In I309f5fdb2088db1293a2278bc4a0518aa12b5601 with SHA-1 8040f46a12 is already in history

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

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