[automerger skipped] Merge "disallow changing from multi-sim to single-sim for carrier apps" am: 2fde70f394 am: 0fc5daecf5
am: bbc1951d24 -s ours
am skip reason: change_id I511d95772c3b662279d6dc008bdb58ffc45398cb with SHA1 1731878a79 is in history

Change-Id: Iea00c297c81efa503af4b3fe63b6776a93a35ccb