Merge "Only update the current connected set for selfManaged only" into tm-dev...

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

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



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