Merge changes I89798eee,Ic3dbab31 am: 14f321f5a7 am: d71f056272 am: 90076fb0a6

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

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