Merge "Add APN type XCAP" am: 126564a371 am: 847b15d671

Change-Id: Icb2d71fc1333a4109bd55e4b3acc6825308ed288