Merge "camera2 docs: Fix instructions for using SurfaceView." into lmp-preview-dev