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