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