[automerger skipped] Merge "Add preferred APN related SharedPref to dumpsys." am: 910a202e5c am: 596b6123f5 -s ours
am: 6920ec56b0 -s ours
am skip reason: change_id I4e915360f5caebb3443b09da57f1cad59b933eb8 with SHA1 f5eae59605 is in history

Change-Id: Ieb34ba66356237a4c52f4c4f3bdb16f049291276