[automerger skipped] Merge "A test api to override carrier information" am:...
[automerger skipped] Merge "A test api to override carrier information" am: 3152b6c2 am: 0e4ea420 -s ours
am: 19f7a8bc
Change-Id: I1d73321b62cab963d5f46368db7cb2b116b49f3e