[automerger skipped] Merge "DO NOT MERGE Add preference controller extended by most Bluetooth preference controllers." into pi-car-dev
am: ebca8df300  -s ours

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