[automerger skipped] Merge "A test api to override carrier information" am: 869a9357f3
am: a9e915f6f7  -s ours

Change-Id: I527d00b6c5219e09a83eaded8e1efff9d7bec56a