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

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

Change-Id: I8b5cd55eae5ebdbc0a5fe98f5e493cb1ca9be6cc