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

Change-Id: Ic48f0e8b70ae3c7d45df27a9d4f633cebd6b6d24