Merge "Camera fov: Add annotations for DetermineFov.java, PhotoCaptureActivity.java." into stage-aosp-tm-ts-dev