Merge "Detailed logging for volume test teardown" into udc-qpr-dev am: 3ee9defc

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



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