Merge "Add APN type XCAP" am: 7c03a80247 am: d74193446c

Change-Id: Ie74716546ce86dc951e411bff829c1f842cfc51e