[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: 98829b5f -s ours am: b2ed5167 -s ours am: 62390ce4 -s ours am: 01c7df89 -s ours am: ecf42591 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I17bc3635b31e6e20267e3d4c699983f5564b6a42