tree 7956c10b17a8071a3b6674a43fc92c50c492dac4
parent fe7f309faead2bfc6c1535c9ba6b027c009bbf7e
parent a6e8219c59f82b39228c0a3b0aa2170a565e25f3
author Chiachang Wang <chiachangwang@google.com> 1574770213 -0800
committer android-build-merger <android-build-merger@google.com> 1574770213 -0800

Merge "Refactor based on new NetworkMonitor" am: 0d7ed7932d
am: a6e8219c59

Change-Id: I631487e6ccc500dd921ec04fa82713f35523dce8