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

Change-Id: I8a07cec1e1c14c2de5646eae64b5f092aa618a46