Merge "Log volume dialog" into tm-qpr-dev am: 6d61c09d am: 959cf26b

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



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