[automerger skipped] Merge changes from topic "upstream-hal-v7_1-p4" am: 7ed70a8033 am: 991c01efc3 am: e18ab24d7a -s ours am: 117ef4db12 -s ours

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

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

Change-Id: I615b77047035b3710d3bf0d61ba240def17f9f5e