[automerger skipped] Merge "Add network disconnected callback" am: 6d1437a596 am: 11d95a5c72 am: 9e4cb91813 -s ours

am skip reason: skip tag Change-Id I602ff2c688909473b03b72c9407d4286608cff4c with SHA-1 4ab0a63b36 is already in history

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

Change-Id: I7a5a9589eaa8ef0022d5f9ee5f857bbe70fa38ad
tree: 983254884c9e939711860862c8d3d0e1ce44b032
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING