[automerger skipped] Merge "Merge ab/7061308 into stage." into...

[automerger skipped] Merge "Merge ab/7061308 into stage." into stage-aosp-master am: 533fbfb1 -s ours am: 17b18904 -s ours am: 52de3e6a -s ours

am skip reason: Change-Id I1512f0aee1f960e809a42448b9aafed0de3dbc2a with SHA-1 2be17732 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f12ca7b3febe95f10544408ac296274fa798a75