Merge "remove deprecated SIM_ACTIVATION_REQUEST intent" am: 7f8d27f84b
am: 4aadda1902

Change-Id: I5c01a75cbb65b8374548c18c5139f9d892e14f49