Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum" am: 1211941aa0 am: 0d506fc4f4
am: eced6cd14a

Change-Id: I53d0d6755c8e0be34db66da56efa483006e538ac