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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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