Merge "Camera: Populate ZOOM_METHOD in CaptureResult" into main