Merge "Override phone settings from CarSettings." into pi-car-dev
am: 167d106645

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