Merge "Add permissions for using PlatformCompat methods" am: 418169d181 am: 3df9ed3852

Change-Id: I327a675c30f3fda48d1f8a3876612221c9352cb2