Merge "A test api to override carrier information"
am: 869a9357f3

Change-Id: I136839e02e19f1197c3e8cd90fb3ce4b492aa4f0