[automerger skipped] Merge "Trampoline SmsManager SimDialogActivity intent" am: 7c4bf35f19 am: a358e2697b -s ours am: e13e660a33 -s ours
am: d3536c3cfc -s ours
am skip reason: change_id If4fa7d512cba134ac4a40f3838cbf761a378514d with SHA1 a0820211b4 is in history

Change-Id: Ia773a0c9c2e98db0f52017f81680b1c3b10025f6