Merge "Adding support for multiple "default" networks" am: 8bb0310bbe am: 0a3ad27abb am: 40ebaee7a5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcb06ea4004e988190ac8ae0dfaa2498d79777fb