Merge \"Fix for wrong ringtone when using VoWiFi\" into nyc-mr1-dev
am: 0664aa0b81

Change-Id: I3abfef48dde0ae9581bae7d88e7535f188d36dbb