Merge "audio flinger: fix sink metadata for telephony software patches" into tm-qpr-dev am: 9cace9f31d am: 10668f23c5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/20132887

Change-Id: I370ee77e7afd3de3b1170961f3342292b11439d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>