Merge "Add a better getLastQueuedBuffer" into sc-dev am: 5d5f7a741e am: 219566728f am: ae9639307e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14613610

Change-Id: Iefa2fad4f1e93cf6eb74ce2a188b4bb031fb1a8c