Merge "MediaMetrics: Fix inaccurate attribution of thread device" into...

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

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



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