Merge "Have connectivity self-register manager classes" am: d8c4953e7e am: 98c48f7101 am: f99ed40471

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a664bb9e9f2f835f148d0102f8b53c010bb7791
tree: 55e410ebe79d95b9e37b70432d0b79c4b2576b5c
  1. framework/
  2. service/
  3. OWNERS