[automerger skipped] Merge "Adding traces to codec framework" into main am:...

[automerger skipped] Merge "Adding traces to codec framework" into main am: 6d6a821f am: c57c590e am: 7199964a -s ours

am skip reason: Merged-In If65c89fb4ea1460430667f09583f36f38468417b with SHA-1 79c516b7 is already in history

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



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