Merge "Add test API to override carrier config" am: a82f952fe7
am: 657e2a925d

Change-Id: Ic93a7e349e412c84d2c3752d9fe1911e42c08ceb