Merge "Merge "BluetoothClass: Use mask to get MajorDeviceClass" am: a9f7570d am: 9fa0668d am: e1271704"