Merge "Add permissions for using PlatformCompat methods" am: 7202e904c9 am: 69ca2fcfa0 am: 9e28d2118f

Change-Id: Id9b74f1f74f3e4efaaa3e1657a64b7f8d229cc01