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

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

Change-Id: Ib94847ab028a1ead9a283148206ec688ce02582e