Merge "Bluetooth: Spell mandatory correctly" am: e7899bcd32 am: e17c4e0003

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

Change-Id: Ibf359c50af05c9bbfed27b97d42e1e9f2a9f9c7c