[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in...

[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into qt-dev am: 204ab511 -s ours am: 5a1724e2 -s ours am: 037fa269 -s ours am: abc15657 -s ours am: 8ab6bd5b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib33508b59ddca6826471d04af97645ebb1065839