Merge "Merge "Modify BT behavior when connecting to active device" into...
Merge "Merge "Modify BT behavior when connecting to active device" into rvc-dev am: 6466a739 am: e2f92f72" into rvc-d1-dev-plus-aosp am: b229e184
Change-Id: If22f0f6cdfc557076ebaa205f2acf00d703b5e44