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

Merge "Update connected devices sets when app is killed" into tm-dev am: 6f8c988b am: 88efbc55 am: 5ee8a78f am: 6d450370

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



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