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: 909c36b7

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



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