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

Change-Id: I837d08d3c879a1f0db68a21d9d7e1d2431236988