Merge "Adding per-app default network callbacks support" am: a64b652d am: a22b7a33 am: 697e3060

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie34506791d5c44b514e5d0c6167c79f863bd09e2