Merge "Remove Protocol.BASE_* usage in Connectivity" am: 7ffb87e4ce am: e4a8d2ff33 am: ec5b8f3b24

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

Change-Id: I0bb7aec183efdeed894447a3b5abc446b9ca46c8
tree: 7a665a1dac9c976c2bb347e22d5b3e8bc4228e2f
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS