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

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

Change-Id: Iddba97162a71fedb6553806f05fa295b8f735226