Merge "[Output Switcher] Fix volume adjustment metric logging" into tm-qpr-dev am: 34539f92

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



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