[automerger skipped] Merge "Create new API for MNO carrier id" am: 6a4940773f am: e6242670fb
am: 19ae7dc60c  -s ours

Change-Id: I05844be133376ad11dddddaaa3468df7e47984ff