[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: cff0eb4e -s ours am: e8786edd -s ours am: a1ae93ca -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