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: 243657db am: 29a150c1

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

Change-Id: I6b31294bc71136b3858c7bb06ebd5255c722f23d