Merge "Add Emergency service categories in ImsCallProfile"
am: cfc6518c48

Change-Id: Iaee2992256355161731450d2681668af9e91975a