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