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

Change-Id: I36545813a272f9e91722d5ade1a855da2b8894e8