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

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

Change-Id: Ieca69d4ff1d2a7f3b369bb4dcabaa702fbab4594