[automerger skipped] implementing concurrent codec metrics am: 1f002cf0 am:...

[automerger skipped] implementing concurrent codec metrics am: 1f002cf0 am: ca1afa07 am: 349cd29c -s ours am: 64146ca4 -s ours am: c54d34ad -s ours

am skip reason: Merged-In Ibaa1fb9607e486f2eb79bf02d79c630e09d62b4a with SHA-1 4e531c84 is already in history

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



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