[automerger skipped] Merge "Initialize new mPhoneIdToSlotId item to...
[automerger skipped] Merge "Initialize new mPhoneIdToSlotId item to INVALID_SLOT_ID upon ss->ds switch." am: bb1a5b4e am: f08c40a2 -s ours
am skip reason: Change-Id I598b96ceff2552e73fb223896b60c17407463019 with SHA-1 2b9f5325 is in history
Change-Id: I0949c90d7828dfd7357bbc6d6ddf16c0eef50871