[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE...

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: da6ac34b am: e19854ca -s ours am: be54ee14 -s ours

am skip reason: Change-Id I115103a3400648975f1ec13f1616cc05ef205679 with SHA-1 a1fade51 is in history

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

Change-Id: Ia8ae02ea4b014d6935a58baa79233509b9e7d692