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

Change-Id: I50f4fc97b2b5245c4921b281a8ceb74eeb60bb3a