[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO...

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 10d58f6f -s ours am: dab2441b -s ours am: 653a02f0 -s ours

am skip reason: Change-Id I0d1d88bf6aca3324e8348642aa7e77aa663ba806 with SHA-1 c9a594fc is in history

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

Change-Id: I529985912a3bcb8783ebbf6d5e3323296687539c