DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""

This reverts commit ca85cc9d278d19eef92d9ed37668e906522f56c2.

Reason for revert: This patch should be submitted with whole topic.

Bug: 80227045
Change-Id: I446329aa3370b64b2a943a0f970d0236258455a3
2 files changed