[automerger skipped] C2SoftAacDec: Fix reset while codec's stop() am: 87604efc am: af9cd746 -s ours

am skip reason: Merged-In I61b9cf8ed61fc3cd02068cdc696ba24e30d1ca3c with SHA-1 0e906234 is already in history

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

Change-Id: I61642d3085a93ac83b1e79064c25b7d8ab8be66f