Merge "Remove Bluetooth autoconnect on dock"
am: b65c7fc810

Change-Id: Id3cf62ca55ff39867041b495aa832e220fbf70ee