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

Change-Id: I61fb0370d40aea103ae92daf31ed57b0005c751b