Merge "bluetooth: Fix common typo" am: 2f8032fd8b am: b0182963ab am: 3bb83023a8

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

Change-Id: I42928af23c008faf7d3fe198d4aaa9356409af9c