Merge "Adding per-app default network callbacks support" am: b7adcd0e6e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d7132cc0f563b5411583259011b7326f386403e
tree: 428e635338afdad052e6d05118c98dc83836380b
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS