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

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



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