Merge "Tear down VolumeDialogImplTest cleanly" into udc-qpr-dev am: 0b73a074b2 am: 7d641daa0b

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

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