Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager"
am: 392f3db6b0

Change-Id: I374eb6af26f16c089054b98140648e0004e7dc59