[automerger skipped] Merge "Add a better getLastQueuedBuffer" am: 664c06f9 am: 7361a8b1 -s ours am: 2918a5c5 -s ours am: 9dd50b7b -s ours

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

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

Change-Id: I90d3b4e2f086d8b07564280216eb50cbb47644cb