Merge "Trampoline SmsManager SimDialogActivity intent"