Merge "Fix logic to preserve preferred APN across build update." am: 9244cf1ea8 am: 48835bad79
am: 2a21221447

Change-Id: I2e62fb29d255b51625cde2b8a774e8f0bcaf5640