Merge "Add a better getLastQueuedBuffer" am: 664c06f951

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

Change-Id: I566e33928fcebf86fede1a830b12f7a394ddd16c