Merge "libbinder: recommend merges in AOSP" am: 49d9f266b6 am: 5706ce00f2 am: 274034609d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2492855

Change-Id: Icb5a0d6c1baf04d684f15cd9eca6bb4a9b2f3aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>