Merge changes from topic "audio_egress_metric" into tm-qpr-dev am: 4ee9f703

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



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