Merge "[Output Switcher] Fix volume adjustment metric logging" into tm-qpr-dev...

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

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



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