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

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

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