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

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

Change-Id: I433e9908699ac6b54efb1f90f9d1a9bbaa5cda23