Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2753014 Change-Id: I8a2ff0f6b3ebe5aad3040ab4c5b203c87cb27b7c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>