Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp am: a06ef7b194

Change-Id: I15801851140bacc91006a5f2f9791eebc2534e2c