Merge "Merge "Bluetooth: Fix formatting in getAlias()" into rvc-dev am:...

Merge "Merge "Bluetooth: Fix formatting in getAlias()" into rvc-dev am: 16a30763 am: bda0f78f" into sc-dev am: 3131ed56 am: d6fe582a

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

Change-Id: I3c9586d50f55882c607a5e78195597fdac3c7124