[automerger skipped] Merge "DO NOT MERGE Allow static overlays of the car/libs used by Settings." into pi-car-dev am: 58bada3bde -s ours
am: 68559986c0

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