[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: fab3756f -s ours am: bab5d4d2 -s ours am: fba68dbe -s ours am: a82a3550 -s ours am: 420f6609 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia8ce7bd02f2793f7ba5f068afad714b0431e7426