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

Change-Id: Ia1a3da2bb28ad67bc6ede9793b94eeb7b478a35f