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

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

Change-Id: I7753e885be8c1478bafe8ee3f676c99cdb24da8d