[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: e6c3e11f -s ours am: f9b490f8 -s ours am: 4f75cf65 -s ours

am skip reason: Change-Id I1dffd41fa373f0b29559c933cc8c5aaa1e3b2478 with SHA-1 b2dae220 is in history

Change-Id: Id14128117440a5d0611051d8de540ba88bc9c83d