Merge "Do not show SMS SIM pick UI for Cell Broadcast Config change" am: 4ae4e50def
am: f15dabde00

Change-Id: I13573f02a8b14fe695222cced5e8fbfa493ed733