Snap for 8479861 from 8220eb4ee90774c7af1c56bed82a61625a7a657e to tm-qpr1-release am: a85695ed3f

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

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