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

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

Change-Id: I0bb7aec183efdeed894447a3b5abc446b9ca46c8