Merge "libbinder: recommend merges in AOSP" am: 49d9f266b6

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

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