Merge changes I1432c6a7,Iade9b5b3 into pi-car-dev

* changes:
  Add app permissions to permission management console
  Update copy for User Restriction Management
tree: 10231954787ffbeb07b5371aa17872373f8f700d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg