Merge "Merge "Bluetooth: Fix formatting in getAlias()" into rvc-dev am: 16a30763 am: bda0f78f" into sc-dev