[automerger skipped] Merge "Implement previously connected device UI" into pi-dev am: 3e644756c3
am: 67110f471e -s ours
Change-Id: I90eabbfa8cd5cccee3a6ddacd4039d11bb068e43
This commit is contained in: