Merge "Simplify code to preserve preferred APN across OTA update." am: b65323596e
am: 1b89548e20

Change-Id: I6b6e3a9ab3ed40571d187f5c72a24df4dd965cbb