[automerger skipped] Merge "Add a better getLastQueuedBuffer" am: 664c06f951 am: 7361a8b1bf -s ours

am skip reason: Merged-In I1f7b5981405b2f20293bce9119414fc7780b8eb6 with SHA-1 aa5a0b26bb is already in history

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

Change-Id: I2bf3df52274aab1b7f1cf6bf25d682b5bb229aae