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

Change-Id: I345b2853acca9e0165c2bf26d885ff794b734d69