Merge "disallow changing from multi-sim to single-sim for carrier apps" am: 2fde70f394
am: 0fc5daecf5

Change-Id: Ic5c1a3f39495146874e0644c5b8b37ec61910ea0