Simplify code to preserve preferred APN across OTA update.
am: d4d7381eb1

Change-Id: I85213df7a4d0f05133bb8a1f423732907df2f4da