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

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

Change-Id: If48de0d3fe326d72170b13ec6a9477dfc8dc48ff
tree: 75d5543ecf24c01300c558018dd04c73b1e7c22a
  1. core/
  2. services/
  3. tests/