[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: dda7b2ce -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie3c857aac50559bdff2591a3559c337f6040f363