Merge "Run callbacks on ConnectivityService thread"
am: bef5d2165d

Change-Id: I7a8d035ec7453c5351eb2646c631c19964cb0f88