Merge "Add a better getLastQueuedBuffer" into android11-gsi