Merge "Add SharedPreference information in TelephonyDebugService dumpsys"