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

Change-Id: Ia8986defbb311e29f512c6611154dea49e16627a