Merge "Prevent mte_upgrade_test from hanging if MTE is disabled" into main