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

Change-Id: I1ef675e25257ae834ba626ba5f0f20c0f36d4518