Merge "Have connectivity self-register manager classes" am: 4ad0fdc5c9 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