[automerger skipped] Merge "Fix concurrency issues with ringtone playback."...
[automerger skipped] Merge "Fix concurrency issues with ringtone playback." into qt-r1-dev am: 8841b179
am: 32d8308d -s ours
am skip reason: change_id I9a119b15d2853a44d5850d040bd31340d1e34127 with SHA1 bbe5d150 is in history
Change-Id: I229ad8071339172af947838b17b557a82a6cd971