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

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



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