Merge "remove deprecated SIM_ACTIVATION_REQUEST intent"