[automerger skipped] Merge "C2SoftAacEnc: Clear encoder internal buffer during flush" into udc-mainline-prod am: 8dc0615e -s ours

am skip reason: Merged-In I197781c8490e1de2217a2aa019ac780c7873f6d5 with SHA-1 3a66c4e0 is already in history

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



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