[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: 7f2f4bf3 -s ours am: 22fde893 -s ours am: 010acb9847 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic84e01036a0904a0db9f03ee90565fab3a5b19b3