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 am: 5a1fff66

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

Change-Id: I8601c3db8a3b93af0d7475b5c67678bfdadaa814