Bug: 64131637 Test: Unit test CarrierIdProviderTest.java Change-Id: I5e1d061d39248be12dd1e6ff1488dd3268f5f3ae (cherry picked from commit a9214ba0)