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

Change-Id: I1cf8e7beb70647391dafce45a6406577462f345d