[automerger skipped] Merge "codec2: enc stat: add local params" into tm-dev...

[automerger skipped] Merge "codec2: enc stat: add local params" into tm-dev am: 3c6e4eae -s ours am: 2cb661fb -s ours am: 7a797c02 -s ours

am skip reason: Merged-In I6269cfc39122b940f9aeb7282913dbeb6b58ea4b with SHA-1 86a16f99 is already in history

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



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