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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie34506791d5c44b514e5d0c6167c79f863bd09e2
tree: 01a48fd1bbdfc82d0f618f125cae3b6fc821cdfa
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS