Merge "Code clean for audioflinger" am: 75270309 am: 7a6f66bf am: 524e01e2

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



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