Merge "[Fix] Bluetooth device ordering" into rvc-qpr-dev am: a6b0836e am: 1ff4cc3f am: da6e3628

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

Change-Id: I199deb8dcd26c4fa2eef96086454c327893ca123