Merge "Add APN type XCAP"
am: 126564a371

Change-Id: I284f589c6dd406868e445b97278ac2e2abad1439