[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 4381e43edc -s ours am: ea7041e7a9 -s ours

am skip reason: Merged-In I784966b69df92eb1fde4fa4d80e0b1fad9c70a01 with SHA-1 019e325e34 is already in history

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

Change-Id: Ie46cebf3b19a98fe3713481b9ee519732c31f73b