Merge "Whitelist PlatformCompat permissions for MediaProvider"