Merge "Simplify CachedAppOptimizer.freezeAppSync variants." into main