Merge "reflect libbinder/am split" am: da164b6f83 am: af31a081dc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664801

Change-Id: Ieb02fc37074b906baca37510ce9f145e9d18ac3a