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

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

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