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

am skip reason: Merged-In Icfd3007a194da7ade037e359858b3dd48f24a0d6 with SHA-1 a0cbb80f58 is already in history

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

Change-Id: Ib4342178094bbd5de82fbfa9aeeaa54cdd457cb2