[automerger skipped] Merge "av: audioflinger: reduce duplicate code" am: e25b43e7cf am: fc63d96b88 am: beb2b75e7d -s ours

am skip reason: Merged-In I0d3600fc27ed64d6331222715ca5c3ee56e64c6a with SHA-1 c19aa9e86c is already in history

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

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