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

Change-Id: I748adb663cdf251edffce05268813cf9e1f79a44