[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: c20374f3 -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: I2dfe32f89172aaf2b1804b0ca095456dafd8f5e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>