Merge changes from topic "upstream-hal-v7_1-p4" am: 7ed70a8033 am: 991c01efc3

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

Change-Id: Ic2a0f97d4cbc8a23251cce48cc01481b5b4aa920