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 am: c6a61eb4
Change-Id: I7812533ac4617ec6d8b024e85db2a6fbbb669b8e