[automerger skipped] Merge changes from topic "upstream-hal-v7_1-p3" am:...

[automerger skipped] Merge changes from topic "upstream-hal-v7_1-p3" am: 4673d5ab am: 5eeb9fe0 am: c9028ba2 -s ours

am skip reason: Merged-In I2522653600a254ddcf2c4eac8bed1df69ac11d3d with SHA-1 893ea216 is already in history

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

Change-Id: I44f0221da5e0957db568c702e998975c5f13c02e