Merge \"Fix for wrong ringtone when using VoWiFi\"
am: e3596517c1

Change-Id: I70e9055b946e92cf21c384ac263dbea0d679b23b