Merge "Tighten up Binder.clearCallingIdentity() usage." am: 1fe717a58a am: c608a3e283

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

Change-Id: I4b322e46aa357c6a6c3c01aa98380b26775e9c6d