Merge "Update AudioFlinger to use templated unique_lock" into main