Merge "Update connected devices sets when app is killed" into tm-dev am: 6f8c988b am: dcf5522b

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



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