Merge branch 'LNX.LA.3.5.2_RB1' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-11.0

Change-Id: I2452b5410e87fa2ef0d09d5929e5813622f17d5b