Merge "Fix current connected device not update" into rvc-dev am: 37fdaf90 am: 24489ad6 am: 7deed7cb

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

Change-Id: I73d6fc15a048694195c82d4c5a9eae8e971a2560