[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master...

[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 251697bd -s ours am: a808d5db -s ours am: 9270f79d -s ours

am skip reason: Change-Id I6756cad681e4cfa01868450214da0d7b2d5261e4 with SHA-1 7dd6ab3d is in history

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

Change-Id: I06db1c201c43f3a9c151fba9436b6e2dfc9f98b4