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

Change-Id: I3cb9c887c5af6b1e4a7b62aa81b15be86c986aea