Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager"