Merge changes from topic "b37280010" am: db3bbfcbf1 am: 5595ac6f23

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

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