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

Change-Id: Ie243b230d3f6d8aca5c292ee497d9e4dc060aec0