Merge "Migrate trim_resources_with_background_trim to aconfig flags" into main