Merge commit '8021537ffea45d1a36274217610a314b3a0ac774' into gingerbread-plus-aosp * commit '8021537ffea45d1a36274217610a314b3a0ac774': BT settings wait for HS service before connect. DO NOT MERGE
Merge commit '8021537ffea45d1a36274217610a314b3a0ac774' into gingerbread-plus-aosp * commit '8021537ffea45d1a36274217610a314b3a0ac774': BT settings wait for HS service before connect. DO NOT MERGE