[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: 7fb05672 -s ours am: 361b1eb6 -s ours am: b280e6c5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifec0c57cdcf7f97afa578e376b993bcdd1f2ba27