[automerger skipped] Merge "Add APN type XCAP" am: 7c03a80247 am: d74193446c am: 675c99fbe4 -s ours
am skip reason: Change-Id I662f743cca3c6b2f919d84cf0570f23a1f6d9791 with SHA-1 d01a0b2e2e is in history

Change-Id: I9aa92ccc719b4d8422acd0dc54aa4754bbb7a158