[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: f939f3c8 -s ours am: 22acaec8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I58b599f80a1e32c0220f5e958429d983e5adaa58