Merge "MAP: move addMessageToUri to BluetoothMapContentObserver"