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

Change-Id: I288994ccfdd044453aa818681745b8e69881264a