Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev am: 8e7b9348 am: 76bd5dfd am: 5b80bb2e Change-Id: Ib44e6c1bae259d94d88337b2bd41301d08d1527b