[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 8a37d47288 -s ours

am skip reason: Merged-In I48fb37b9fb8af94825f6e7c3ea05b9620c8e1a7e with SHA-1 df18496cc6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libhwbinder/+/15572008

Change-Id: I9ef1173600fb036c8b22618521c4c6d5c057b0d6