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

Change-Id: I1c889c5809f386540a55fd6e7c1ae38cf155ebc7