Merge changes I89798eee,Ic3dbab31 am: 14f321f5a7

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

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