[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 8ac301f5 -s ours

am skip reason: Change-Id If5afd00334e8b09250df1ae97dec9285e39ad930 with SHA-1 7a4a65d6 is in history

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

Change-Id: Ibba743570f0d0459bceed892702d3d3758c4925d