Improve cherry pick detection

[oliverchang]

Currently cherry picks are detected based on the git patch-id.

We can add additional heuristics like searching for the "cherry picked from" string in commit messages in cases where the cherry pick results in different patch-ids.

[github-actions]

This issue has not had any activity for 60 days and will be automatically closed in two weeks