Merge "Enable auto select only when set by Carriers"
am: f808cbff17

Change-Id: Ia5aa2b6e1971568122e8da858df02d2f92f038de