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

Change-Id: I0680929fd6a5874a0e0c51b8edb9286119397cb4