am 7aebe67e: Fix a problem where audio preview would continue without any way to stop it. http://b/3061678

Merge commit '7aebe67e1575ca7d2aab5b5210b356fc8c0f9a20' into gingerbread-plus-aosp

* commit '7aebe67e1575ca7d2aab5b5210b356fc8c0f9a20':
  Fix a problem where audio preview would continue without any way to stop it.