Merge changes from topic "b37280010" am: db3bbfcbf1 am: 5595ac6f23 am: 8c121e44ef

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/870702

Change-Id: Ib485e1b9bee1ad7f5c7b966a0557caabea3e939e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>