Merge "Use OnImageAvailableListener to wait for buffer" into sc-dev am: 008af730 am: 54889a31 am: c4349ee4

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

Change-Id: I114fd8f7686f10a3f789756d6b98576b97890853