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

Change-Id: I8fa6e3cc276590d951acd320c4b8b956f6a8d306