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