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

Merge "[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into pi-dev am: 44dc2b27 -s ours am: 34709e93 -s ours am: 36fbfc6d -s ours am: 01a542b3 -s ours am: c63f658f -s ours am: 864ff0ff -s ours am: 010acb98 -s ours" into sc-qpr1-dev-plus-aosp am: ff7e46cb -s ours am: 728bb7a0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If3f35b9fe973581e2c7180c8f9fd7985713cbeb9