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

Change-Id: Ib137d185149dca4ae5117f6c32f610281960123a