[automerger skipped] Merge "DO NOT MERGE Add preference controllers for displaying local and remote Bluetooth names." into pi-car-dev
am: 27ec702b5b  -s ours

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