Merge "MediaMetrics: Fix clang-tidy narrowing warning" am: 7931cbd1bb am: fcfde3efde

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

Change-Id: I767ea3546041281e99058e72c3194794c2900d9b