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

Change-Id: I9295a1aa31f8214518cfe243ec90e45b3af75f18