[automerger skipped] Merge "Make sure to obtain correct subId in carrier...
[automerger skipped] Merge "Make sure to obtain correct subId in carrier config change." am: d0c4d60c am: 5ae70cb4 -s ours
am skip reason: Change-Id I1dffd41fa373f0b29559c933cc8c5aaa1e3b2478 with SHA-1 b2dae220 is in history
Change-Id: Ic5141fea791c98ef9d7fc69eca89b547f8085d23