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

Change-Id: I7ac4e890f7c4f382c543f274be1d6cf54fa579ee