[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ea4fae56 -s ours

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

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



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