Support fetching from an upstream main git branch am: c0d933345f am: 797a4508bf

Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1705651

Change-Id: I40eadbdce46df7c2984d4f14b0c84550db1085ac