[automerger skipped] Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev am: 5cb6b79400
am: 270c692e7f  -s ours

Change-Id: I7fe330c63ac16dd515782135e8d7b6f51151ee78