Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev
am: 8e7b934850

Change-Id: I91225b8b4b24f9580ce8599462913b81ee932f6f