Merge "b/2367861 Auto connect if the user turns on BT while docked." into eclair