Merge "Clean up aconfig flag carrier_enabled_satellite_flag" into main