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

Change-Id: Ia0ae310924f586689aa4fb75f687b782d693725d