[automerger skipped] Merge "Grey the previously connected device preference" into pi-dev am: d24c9e4a80
am: 25ed11a1a7  -s ours

Change-Id: Ibb585afdcbd1e036b59219987c3e135675205387