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

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

Change-Id: I7fdc2170497d5fe4d27263a4f78be71f0cba2e24