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

Change-Id: I62383251b852b855bb87127ce799c5421e095647