Merge "Add a new settings to device/sample/etc/apns-full-conf.xml for Truphone:"
am: 7b7cee5ba4

Change-Id: I5027d228aee48e13bb7d7e7a53c538ce13fe2f2c