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

Change-Id: I038297d188f3fc1af6f7e20bc33a9b6aa6bedf4c