Merge "Clear caller identity before calls to PlatformCompat"