Merge "Add a better getLastQueuedBuffer" into sc-dev am: 5d5f7a741e am: c01727c3ce am: e70c0f55e7

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

Change-Id: I362673f457ed2362a4b1aa7a6cf9d2b45a7c21fa