Merge "Hide APN, USER and Password from log in SETUP_DATA_CALL" am: d676c5c134 am: 1d2ddbb9ae
am: 5f676ad625

Change-Id: I33817c1902c72aac417865287d137f8e1e919480