am 470687e2: am dd28d563: Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.

Merge commit '470687e251ecb298bda17f3e3978ffeaf05622a9' into eclair-mr2-plus-aosp

* commit '470687e251ecb298bda17f3e3978ffeaf05622a9':
  Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.