[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 76364127 -s ours am: a5ab903d -s ours am: d69d800a -s ours

am skip reason: Merged-In I96a417467346a57b13c2efae12a183d78506afc3 with SHA-1 7e30d84d is already in history

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

Change-Id: I85e1525b6f750418864090b9cbea18efafd87f37