Merge "MediaMetrics: Fix inaccurate attribution of thread device" into tm-qpr-dev am: b1df0092

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



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