Merge "Merge "BQ: Don\'t return fences from dequeue in shared buffer mode" into nyc-dev am: eb6377eb13 am: 217b5d19a6" into nyc-mr1-dev-plus-aosp