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

[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master am: c4978ce2 -s ours am: 43b7acc8 -s ours

am skip reason: Merged-In I59ea99e8a1720f61954747f6c29e14cfea9a0f56 with SHA-1 afc2da8e is already in history

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



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