[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in...

[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into pi-dev am: 44dc2b273b -s ours am: 8333c5ff -s ours am: 39fcd4ca -s ours am: 1dda1e0f -s ours am: 12b4fb1c -s ours am: e10763d8 -s ours am: e1930da3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6439302d38b74a0ba4de85944a20104c38d2b7ea