Merge changes from topic "upstream-hal-v7_1" am: e4061de77e am: e27bd9b738 am: a8a9c52a22

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

Change-Id: I36073bba637aa1dd7f021f8242ce1edbc80167c9