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

[automerger skipped] Merge "Adding traces to codec framework" into main am: 6d6a821f am: 6fe1d11f -s ours am: 610f4fa5 -s ours

am skip reason: Merged-In If65c89fb4ea1460430667f09583f36f38468417b with SHA-1 7ba67075 is already in history

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



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