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

Change-Id: I12d7b8fca85502807288bba03417f2ceb0c9f533