Merge "Remove Protocol.BASE_* usage in Connectivity" am: 7ffb87e4ce am: e4a8d2ff33

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

Change-Id: Ib94847ab028a1ead9a283148206ec688ce02582e
tree: 55286782156f305ba900c6bda642a2527b7fb216
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS