Merge "Test extra info sent to NetworkMonitor" am: 9792742ee0 am: 26cd395a9e am: 41b5925f01

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: I52edaf94601620b8b22030e586ae9de0742b3303
tree: 83e1799959b5ec54b5258f87f6a48d9d53d9276d
  1. core/
  2. services/
  3. tests/