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

Change-Id: If68a5943ce608796d42b35fcda3d339c9b1bea2e