Merge "Add APN type XCAP"
am: 7c03a80247

Change-Id: Id55713187f5a244bfc19525320e3aec8e43ade18