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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d7132cc0f563b5411583259011b7326f386403e