[automerger skipped] Merge "Merge SP1A.210812.016" into stage-aosp-master am:...

[automerger skipped] Merge "Merge SP1A.210812.016" into stage-aosp-master am: b93183c0 -s ours am: c5a2967c -s ours am: 0a2dfed2 -s ours am: a25b65cb -s ours

am skip reason: Merged-In I0b9a14345475e432b93f92c23010a8b39712443a with SHA-1 8472d91b is already in history

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

Change-Id: I794a4259db9d7035608e78c677c3fc95fc92bce1