am fa14b807: Merge "Display explanatory text in \'App permissions\' settings...
am fa14b807: Merge "Display explanatory text in \'App permissions\' settings when permissions policies are enforced" into mnc-dev
* commit 'fa14b807':
Display explanatory text in 'App permissions' settings when permissions policies are enforced