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

Change-Id: If2d2e1010e39dcdefb8da8a9ef1fd238eed407dd