Merge "Use CONNECTIVITY_INTERNAL on Q for portal URL" am: 2a7cf08b8e am: 58ae094ec7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490178

Change-Id: I305a822620fe2146b46eb04a8e2614c4d3e00873
tree: 2a1555d326c2f21461d9680c79b4c17fc6adcb73
  1. tests/
  2. Tethering/