Merge "Code clean for audioflinger" am: 75270309 am: 7a6f66bf am:...

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

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



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