[automerger skipped] Merge "DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""" into pi-dev am: 44505ef8cd
am: 8a0a3196fc  -s ours

Change-Id: Ia8c92a1817b3cbf379fbe799869a7e3e4ca3aa5a