Merge "Clean up SharedConnectivityManager on unbind." into udc-qpr-dev am: eaa8764caa am: 288bc59298

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

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