Merge changes from topic "upstream-hal-v7_1" am: e4061de77e

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

Change-Id: Ia67897d6c993f8e35de6456512d50aa717812e5f