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

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

Change-Id: Ice414ce2a964c781e617e1331aff17bee6810571