Merge "Prework cleanup and addition of strings for Bluetooth preference migration." into pi-car-dev
am: 3dee2a6c44

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