Merge "Merge "Bluetooth: Fix formatting in getAlias()" into rvc-dev am: 16a307631e am: adb39c5b" into sc-dev am: 3131ed5631

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

Change-Id: Iea09bb0115e7e27cf443baefee6f2de6f0dda966