Merge "Have connectivity self-register manager classes" am: 4ad0fdc5c9 am: 98c48f7101

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I512f95a45ab23d4b7e03c196850d0dab75223620