[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing"
am: 2e08b42aff  -s ours

Change-Id: Ia000091649425fa1d1a2895ecc6a7f0f96157337