Merge "A test api to override carrier information"
am: 420ab92b0b

Change-Id: I4dd105740b4c4954a387d46a76157c9d24b602e8