[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