Merge "Trampoline SmsManager SimDialogActivity intent"
am: 7c4bf35f19

Change-Id: Ie2f5a5749a6fcab3475e1ab16f702cd2113f7d72