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

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

Change-Id: Ia4fcb46866d63f3b96f66507473c86d50aa65b60