[automerger skipped] Merge "Adds new build target for multi_user trace config...

[automerger skipped] Merge "Adds new build target for multi_user trace config for instr_metric test suite perf module migration" into main am: 4b678554 am: 90bf5390 -s ours

am skip reason: Merged-In I39ebaff148dd1b665718fb1d0ca5faef82b1ea23 with SHA-1 289e8256 is already in history

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



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