Merge "improve the testability of carrier id ota" am: a36b713956
am: 65d52ee2a0

Change-Id: Ia009d71c80a9f31ce64799ee06ea0ed867a48cb0