[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: d2adcd79f8 -s ours am: 5a80ca8ae8 -s ours

am skip reason: Merged-In I975390f8f495267ef0cd24dc8e73db859e541146 with SHA-1 16699d13ec is already in history

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

Change-Id: I4fef372e22b9c1302e1d2f4d49bc3d28267646fc