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

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

Change-Id: I2f82620195b6acc7f2a4ccb26d9d1b9fcc0da864