Merge "[automerger skipped] Merge "Create new API for MNO carrier id" am: 7e74c4e4 am: 2c8b12a1 am: 87d67c4f -s ours"