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