[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into qt-dev am: 204ab511e0 -s ours am: 5a1724e2ce -s ours am: 037fa26965 -s ours am: abc15657c4 -s ours am: 8ab6bd5bce -s ours am: 7fb056725e -s ours am: 361b1eb6bf -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4e4b86cd345743f2a3b7ffcc10149f0cc8fd6010