Merge "Remove stale connections to DataLoaders." into tm-qpr-dev am: da38e58d am: d03509a5

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



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