Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" am: 392f3db6b0 am: 484b1b87e0
am: d32f3a1db3

Change-Id: I63311ec4fecd388e595a864d94b3bbb4c1fe8b89