fix: Revert the behavior when both ImageUri and Metadata exist for im…

[aahung]

…age func

Which issue(s) does this change fix?

Why is this change necessary?

Fix #3239 by breaking change #2935
When both ImageUri and Metadata are provided, previously we choose to give "Metadata" the priority and build it. But now we skip it because ImageUri is provided.

How does it address the issue?

Fix the logics so that function is only skipped when ImageUri is provided and related fields cannot be found in Metadata. Previous behavior is partially recovered.

What side effects does this change have?

N/A

Checklist

• Add input/output type hints to new functions/methods
• Write design document (Do I need to write a design document?)
• Write unit tests
• Write/update functional tests
• Write/update integration tests
• make pr passes
• make update-reproducible-reqs if dependencies were changed
• Write documentation

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

[awood45]

This looks well-formed, let's make sure another lead agrees that this is the behavior we want going forward.

[mndeveci]

LGTM, thanks for fixing this issue 👏🏼