Merge "Camera: Use focalLength in CaptureResult for CameraParameters" into tm-qpr-dev