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

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

Change-Id: I0bb7aec183efdeed894447a3b5abc446b9ca46c8
tree: 39bf70aab51d1a9b8dd9ccdee198e1b56bb3921c
  1. framework/
  2. service/
  3. OWNERS