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

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

Change-Id: I31a9d90862bdc73229a9bc52dde61172b0911773