map carrier config to the correct carrier id

initial migration has some issue for JP carriers which reply on
APN for carrier identification

Bug: 110559381
Test: Build
Change-Id: Ieb28953b8087456e6d0eb0935d80dc294db3e8c5
2 files changed