Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am: d098328585
am: 104b2bcc79

Change-Id: Ie935c7df75b95afff7b2817df35afe4798e91813