Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev am: 5f5aa7e1ef am: 2c778512a3 am: b6ecc8ea60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282094 Change-Id: I7dd0f696ea11ebbed877e9ccd8fcdf0d3fe0e3a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: