Merge "SnapdragonGallery: Set NO_BT_A2DP when connected BT headset" into android-snapdragonGallery.lnx.2.0