Merge changes I9b5a140a,Id866d7ef,Ia9ad20fb,I9ffcb4db into main am: 82ed54410d am: 9b8a1b9db3

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

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