Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev