Merge "Adding support for multiple "default" networks" am: ca0ab687be am: 24bc30f408

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic28670aa18dcdd88016733f6b258d4d19a3f358e
tree: cdfc015b81b882029605e519f915fc46da320678
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS