[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: 53d9deb7 -s ours am: 709d4d09 -s ours am: ebf8ff98 -s ours am: 98829b5f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7346cb0a738179419b91fedff8a2d6d67cc6106b