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

Change-Id: If9a3fee2717f74f5c497ce3e5a7bd4585123e604