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

Change-Id: I59554e077d428e890aaf86e069aa02d9aec8c015