Merge "Don't expose raw IBinder APIs." am: 4b4cc572c0 am: 3aba6fdd68

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

Change-Id: I42ef2c83eefc6dc4967e71be82f48cca38d74f43