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

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

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