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

[automerger skipped] Merge changes from topic "upstream-hal-v7_1-p4" am: 7ed70a80 am: 991c01ef am: e18ab24d -s ours

am skip reason: Merged-In I415cbadae9d325ac63160e49e5e638906c8c63fd with SHA-1 285c0a04 is already in history

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

Change-Id: I0a78465f9125cf13bd57ec15da35d37296f5f46a