Merge "Merge "Move the setActiveDevice logic from Settings to SettingsLib...
Merge "Merge "Move the setActiveDevice logic from Settings to SettingsLib (1/2)" into pi-dev am: 6b0a9bc0" into pi-dev-plus-aosp
am: d4f6ba3f
Change-Id: Iba86e60520c1b4a3649d4a5a672f661de5b3163a