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

Change-Id: Iebb7d2c5c9b8d98b8a5c7ae6a5127c3ec5ca6472