Merge changes from topic "upstream-hal-v7_1-p2" am: 3baf9dae14 am: e0196ed308 am: f4817ffe5c

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

Change-Id: I0ddafc3d76e6af17fc0877f35b1050859f8fc1f5