[automerger skipped] Merge "AudioFlinger: Move NBLog thread_local to no...

[automerger skipped] Merge "AudioFlinger: Move NBLog thread_local to no linkage." am: 716474ae am: 8d3636cd am: c2084490 -s ours am: 567f39cd -s ours

am skip reason: Merged-In Ic7128eea2aef47289c6e38ebca6fb5292d919410 with SHA-1 78d8d95b is already in history

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



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