Merge "Expand nuplayer mutex for mediametrics management" into rvc-dev am: d6bca9b5 am: 827d4d11

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

Change-Id: Ie79d4f302c2aeea67d318acf399cb8b12d383d0c