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

[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 68362946 -s ours am: bf23e8d5 -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: Ic1c5ec873beb762b215902e70192e04dafadef53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>