Merge "Test extra info sent to NetworkMonitor" am: cd192301a2 am: 8825abb697

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

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