Merge "Close Tone Dialog if the requested tone has already been stopped" am: a1ae8f3fc3 am: bcc9e0907c

Change-Id: Ifd1a78bd2af89401c335ccef8ce36505a24a8711
tree: 540d3e5737f836d049cbe3e7f9d3c74cfafd6628
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. OWNERS