Merge "disallow changing from multi-sim to single-sim for carrier apps"