[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b519a76f20 -s ours am: 74c735e101 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5d6b2965a070abf05e102f2cca0592999cc7902c