Merge "Adds new build target for multi_user trace config for instr_metric test...

Merge "Adds new build target for multi_user trace config for instr_metric test suite perf module migration" into main am: 4b678554

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



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