Merge "disallow changing from multi-sim to single-sim for carrier apps"
am: 27c8f495f2

Change-Id: Iec876a398bec6fa2c61b633d7ba8e999e4742964