Merge "Surround platform-compat check with Binder.clearCallingIdentity()"