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

Change-Id: I9d27d401f7df88b914387e5b50c025b75899be62