Merge "Fix volume dialog dismiss animation" into tm-qpr-dev am: e58e8db8 am: 9bdbb8c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20844522



Change-Id: I559bdbd751279ce16f30ed63e329ef9288c94070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>