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

Change-Id: Ied825c1e15b64b5f71dca6825acaa001ae3cdf64