Merge "Add test API to override carrier config" am: e667d51249
am: 7191fe1f3e

Change-Id: Ic45084463dd6167ac93de3ca8c180b5349de9d95