Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am: d098328585 am: 104b2bcc79 am: 4071792cce
am: e4cf6229f7

Change-Id: I65c210d8f0ee27540339233d45def0c464920aea