Merge "Merge "Fix current connected device not update" into rvc-dev am: 37fdaf90 am: 27ff5a16 am: dd52a272" into rvc-qpr-dev-plus-aosp am: 9c7500cd

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

Change-Id: I6590f878a1621be19f40bb749161f9a9d42b774a