Merge "Identical setup/teardown for volume tests" into udc-qpr-dev am: d10f410f

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



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