[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937"...

[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: d2356b1d -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: Icd0bdd6437a69845a0d7c4f1c0aa2dabb5eda10c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>