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

[automerger skipped] Merge changes from topic "upstream-hal-v7_1" am: e4061de7 am: e27bd9b7 am: a8a9c52a am: f9020c39 -s ours

am skip reason: Merged-In Id3a99993bf2ee0c87d44f668d759f7c10db9a435 with SHA-1 40fde0bc is already in history

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

Change-Id: I0755a8a9b7bc4a8ef35c4fb953ecc39428d28a60