Merge "audio: fix resume music not smooth after press end call with touch...
Merge "audio: fix resume music not smooth after press end call with touch sound" into qt-dev am: de49eecf am: 43b3772b
am: 0938a7e3
Change-Id: I82742a1647a80aa867033b2cca7944f0f2210328