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

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

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