Merge "Add preferred APN related SharedPref to dumpsys."
am: 910a202e5c

Change-Id: I9c125ec04981346b91284ae0e4d842eadb71e0b2