[automerger skipped] Merge ab/6749736 in stage. am: 3109cbe663 -s ours am: eab682d153 -s ours am: 8a3e98d302 -s ours

am skip reason: Change-Id I047a6d3c09be4f762a745319e2f37d5551abf9f1 with SHA-1 c59eaa7b18 is in history

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

Change-Id: Ib0c768d949f82a23c735553e385dbfc63eaf5f53