Merge "Add permissions for using PlatformCompat methods" am: 418169d1 am: 3df9ed38 am: f637859a Change-Id: I80598339c58679e348a66b7f967eb6dece1d7642