Merge "Define SoftApManager start/stop codes for metrics" into main