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

Change-Id: Iad1bd0ec81d097ddb3e3c75defc370bd344ebc47