Merge "Fix current connected device not update" into rvc-dev am: 37fdaf9014

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

Change-Id: I6f17b65a3b7a9e2283c692e0925fea01ec8b343a