Fix numbering for patch paks when skipping a patch tier on new files
[FYI] Hongyi.Yu
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: Hongyi.Yu
#ROBOMERGE-SOURCE: CL 5377129 via CL 5377234 via CL 5378975
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5406696 by bob tellez in Dev-Networking branch]