Merge "Update UpstreamNetworkMonitor to use custom Handlers"
am: 35c89886c2

Change-Id: I76433822a9b7c124e4b7cfcf2a20cb0e43a60199
tree: eeab54d0b3ed5da16e63da00740e8d27c745f1a9
  1. core/
  2. services/
  3. tests/