Merge "system_server: bulk sync between old storage and new aconfig storage message." into main