[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 9cc09d8dc1 -s ours am: 5b63dd3dc0 -s ours am: e6bcf279ab -s ours

am skip reason: Merged-In I230e1140e4d8840be15c010bb5fa5dafed44cd30 with SHA-1 d222b9cd37 is already in history

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

Change-Id: I65033e7c8ea06a900db3e88302e72ef390f80f2b