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

[automerger skipped] Merge changes from topic "upstream-hal-v7_1-p2" am: 3baf9dae am: e0196ed3 am: f4817ffe am: a04f9a40 -s ours

am skip reason: Merged-In I9bfb937ece3a07a7844877de5f355ece1141f92d with SHA-1 5b8529a1 is already in history

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

Change-Id: I7ebc21acbb20583cf4a52d7230f0efed3c4c12de