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