[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 skip reason: subject contains skip directive

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

Change-Id: I8eea08092531bb9c5185e827e5dd0973310fbc93