Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev am: 5f5aa7e1

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



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