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

Change-Id: I3dd56638e5314f17560b51694985bab957d3a048