Merge "Remove aconfig dependency for 'services.jar' flags via `static_libs`" into main