Merge "getPreferredApn does not need writable database" am: 7629a9862d
am: 8d6efe263b

Change-Id: Ic9b360ae39f68e07934e34f67ceefde1e369c738