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

Change-Id: Iefa6fdcfaa5e3efbfebcf403d284acf569d45ab2