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

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

Change-Id: I7d30763e9ad3452911065218fa520ad624c17006