[automerger skipped] Merge "Add Emergency service categories in ImsCallProfile" am: cfc6518c48 am: 128f421992
am: 47eb930d87  -s ours

Change-Id: If32f62205da2baa586ed2c5cf56ae93c32c54dda