[automerger skipped] Merge "audiopolicymanager_tests: add execution tracing"...

[automerger skipped] Merge "audiopolicymanager_tests: add execution tracing" into main am: 359ce7c3 -s ours am: 0cc21a6e -s ours

am skip reason: Merged-In Ib80459b1379e5bbe3446feddd2ae2a922345f1ff with SHA-1 70b52650 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3391047



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