Merge "Pulling in BluetoothProtoEnums into the apex"