Merge changes from topic "upstream-hal-v7_1-p3" am: 4673d5ab25

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

Change-Id: I55e6af1f9812f1810f74f55498535238fe488ca1