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

Change-Id: I7bfd420524778f682d1836ca21c49361e5330ae7