Merge "Only update the current connected set for selfManaged only" into tm-dev am: 5547ff26 am: 27dcae8a am: 1d5ff646

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



Change-Id: Id6c5a259d5963f220cd01cfff70ea824348c5708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>