Merge "Add headers to audioflinger thread local logs" into main