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: 7cec5a96 am: 84f223be am: efb410d6

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



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