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

Change-Id: Iffdf7ffc1265fce941eb4cd519031da4575ac53a