Merge "c2SoftAmr: dont discard trailing samples during encoding" into main am:...

Merge "c2SoftAmr: dont discard trailing samples during encoding" into main am: 32325124 am: 84a2ab3e

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



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