[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1a7761431d -s ours am: ceff5ecf17 -s ours am: b1955d7682 -s ours am: f1efde9004 -s ours

am skip reason: Merged-In I8d13832dd297c5ca7ddeb87fb5302e5bad82c309 with SHA-1 920309b25f is already in history

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

Change-Id: I021f0eae42203edf9f3708cb2be22e6b4915d739