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

Change-Id: I518504a7ef4c888b5e7f919f0838aed6bb786196