Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev