Merge "BluetoothClass: Use mask to get MajorDeviceClass" am: a9f7570de6

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

Change-Id: I676d00b58e36a1b15201c96436507cc05a3b36c2