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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaaf1ceea1e085f84d4114f99aa582e406dd631ae
tree: e565aab0ca203485443c43172ef53692501936f7
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS