Merge "IMS: Send voice service class by default" am: 8e87c9ee63 am: 2e05be68f8

Change-Id: I0ce5f8d52328ac2e33dc6f9fb0cd5c4f54b23856