Merge "Disable unstable testCacheUpdate_update_apps in presubmit" into main