Merge "Add AudioFlinger to MelReporter thread safety annotations" into udc-qpr-dev-plus-aosp