[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b519a76f -s ours...

[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b519a76f -s ours am: 74c735e1 -s ours am: 44384bfe -s ours

am skip reason: subject contains skip directive

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

Change-Id: I873c2e653a15dde4d23ae10f47f271fe4b949e46