[automerger skipped] Merge "disallow changing from multi-sim to single-sim for...

[automerger skipped] Merge "disallow changing from multi-sim to single-sim for carrier apps" am: 27c8f495 am: fbd7a667
am: eb410b36 -s ours
am skip reason: change_id Ie422577e1f710b033ed85caed9a3e864aadff061 with SHA1 36ede9a2 is in history

Change-Id: I91fe3b707532b9cf1f918254259a257affeab8a5