[automerger skipped] Merge "DO NOT MERGE Add directory access to special app access." into pi-car-dev
am: ca9c97ca1d -s ours
am skip reason: subject contains skip directive

Change-Id: I82c5bcbd0b321f91af573b152bc510f750cafe20
tree: 0f371f8687e68d60f02bdc5e86af23817344898c
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg