Merge "Simplify code to preserve preferred APN across OTA update."