[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: 076223e5 -s ours am: 720ad155 -s ours am: 9f0002fe36 -s ours am: 4e7b3281 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I135254e669b65f8f9d63aabfd867d08c050d85b8