Merge "Revert "Add permissions for using PlatformCompat methods"" am: 41e1423539

Change-Id: I14895222004c238a76a91a204df6b5f957ebaa5b