Merge "Remove Protocol.BASE_* usage in Connectivity" am: 5a819fb84d

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

Change-Id: Ieca69d4ff1d2a7f3b369bb4dcabaa702fbab4594
tree: 3cf5b803cfb5cf933220703975d21ef4fb9fd56b
  1. framework/
  2. service/
  3. OWNERS