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

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

Change-Id: I3741167a308681ab9852f947191d9a8f231069e9