[automerger skipped] Merge Android 12 am: 51a09b3f35 -s ours am: 69995d1cb9 -s ours

am skip reason: Merged-In Ia961878214b0f572ff197f23ce4d30bffaddee0e with SHA-1 a6d67b00c8 is already in history

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

Change-Id: I15a27a646cab6202e220cc7c061c8b1f76362648