Merge changes from topic "b37280010" am: db3bbfcbf1

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

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