Merge "Invoke Both onDataConnectionStateChanged Methods" am: 1699bb7d92 am: e4db115b37
am: d4d4ed769f

Change-Id: I9a33a31cc087b306bd12bb13d7f2d883bd8b6332