Merge "add new API setActivationState to TelephonyManager"
am: 5344c2f944

Change-Id: Ia9253de138f00d1d5e75f9a532e7d9bd00ef62c9