am 4f54368f: am 8d069cf9: Merge "Camera2: Support waitForSurfacePrepared in...
am 4f54368f: am 8d069cf9: Merge "Camera2: Support waitForSurfacePrepared in BlockingSessionCallback" into mnc-dev
* commit '4f54368f':
Camera2: Support waitForSurfacePrepared in BlockingSessionCallback