[automerger skipped] Merge "Create new API for MNO carrier id" am: 7e74c4e431 am: 2c8b12a1da
am: 87d67c4f19  -s ours

Change-Id: If2e79489d0cea4c76b49979e53aa0ed9249ea75c