Merge "AudioFlinger: Extract inner Track classes" into udc-qpr-dev-plus-aosp