Merge "Revert "Add permissions for using PlatformCompat methods""