[automerger skipped] Merge Android R am: ea75dfb073 -s ours am: 3df089925d -s ours

am skip reason: Change-Id I4fec18757b5cfa0b78c47ba28f11eb0cd0fd7ad7 with SHA-1 6f018f7c6f is in history

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

Change-Id: I8fe158994e604e1805c82d9e924753fdab9c320e