[automerger skipped] Merge "Fix gray out previously connected device preference issue" into pi-dev

am: 2ffa711cd1  -s ours

Change-Id: I7df1d799566f9cfef1a94fdc98c2b43c978b1752
This commit is contained in:
Ivan Chiang
2018-06-13 14:36:14 -07:00
committed by android-build-merger

Diff Content Not Available