Merge "Use OnImageAvailableListener to wait for buffer" into sc-dev am: 008af7300c

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

Change-Id: I3b1ba7a5c3b0c7ea7fe03c879bd59e8f4b7b4fd1