Merge "Bluetooth: Spell mandatory correctly" am: e7899bcd32 am: e17c4e0003 am: 438264485d am: d55aea0c0d

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

Change-Id: I78d8b4f3572d172cda209bfe98edd8f3e5f560b0