Merge "Speed up network event generation in NetworkLoggingTest" into oreo-cts-dev