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

Change-Id: I8ada7ccf94e0ade83c0d810daba9703da60a6f59