Merge "Increase the output queue" am: 92affdea60 am: bd993fefd5

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1359543

Change-Id: Icda7ff866a3ef738b3d21b572da7e87f7fc0815f