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

Merge "Merge "Bluetooth: Fix formatting in getAlias()" into rvc-dev am: 16a30763 am: f6db6bcb am: a6e0765c am: dce191bc" into sc-qpr1-dev-plus-aosp am: 1f9fe437

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

Change-Id: Ic5f4e3a2fe4bcd363366d002ad566744833a291c