Merge "Don't expose raw IBinder APIs." am: 6f68764bf2 am: c0c07c1b57

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

Change-Id: I42ef2c83eefc6dc4967e71be82f48cca38d74f43