Merge "Run callbacks on ConnectivityService thread" am: bef5d2165d am: 5af10311a3 am: 6f757cc4a1 am: 5020c0b69e
am: 99ad4a5368

Change-Id: I382db90c318495244a42a2d4af6e5ebf54f05750