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

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

Change-Id: I8447f2a326c3c4e2a96409e5d7756c1368bf1d5b