Merge "goldfish: increase data to 6G for xl config" am: 3109f87241

Change-Id: I60a5a7adfb3d68f442b644d63db948638ca3daa8