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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaaf1ceea1e085f84d4114f99aa582e406dd631ae