Merge "av: audioflinger: reduce duplicate code" am: e25b43e7cf

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

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