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: Idfd3f8843da2ec29accaa6e92b7055b92cb8adfb