Merge "remove deprecated SIM_ACTIVATION_REQUEST intent"
am: 7f8d27f84b

Change-Id: Ia1216368a2a2a4959283d95bbc4be26789f151f6