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

Change-Id: Ie55857ab5d91d5ffd6d488a45f9859ec9cfbbe9f