Revert "toroplus: change to use combined APN list"

This reverts commit 8e358303de22ef55e9b87ddb4622077d85e3ae38.
Gummify

Change-Id: I2e5ea4d2cfaa663c1a5107b0b5ddba6bfae7f78f