Merge "Tighten up Binder.clearCallingIdentity() usage."