Merge "Clean up aconfig flag satellite_persist_logging" into main