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

Merge "[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into qt-dev am: 204ab511 -s ours am: 5a1724e2 -s ours am: 037fa269 -s ours am: fab3756f -s ours am: bab5d4d2 -s ours am: 9f0002fe -s ours am: 440895f0 -s ours" into sc-v2-dev-plus-aosp am: fe11fe47 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5fce2473214efea9450444942348cacaeb867a43