Merge "Don't expose raw IBinder APIs." am: 6e535a1294 am: 5bc05685a3

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

Change-Id: I42ef2c83eefc6dc4967e71be82f48cca38d74f43