Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev