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

Change-Id: I5030d05d5953034d9253abd8b8534d40a083f7e5