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

Change-Id: Ie6c4a274fae210ca72ed746d430b863a85dca2c7