[automerger skipped] Merge "Fix gray out previously connected device preference issue" into pi-dev
am: 2ffa711cd1  -s ours

Change-Id: I7df1d799566f9cfef1a94fdc98c2b43c978b1752