Merge "audio flinger: fix sink metadata for telephony software patches" into tm-qpr-dev