[automerger skipped] Merge Android 12 am: 51a09b3f35 -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: I7e86a6060926fcef5cf6bf8d491bca05b61e7e68