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

Change-Id: I681dcc688aa1e66706c99cfa401c8b89cb6367c3