[automerger skipped] Merge "Expand nuplayer mutex for mediametrics management" into qt-dev am: f9f5f3806f am: d7227f1c8b -s ours am: e25fcf8888 -s ours

am skip reason: Change-Id I75f29a6254c5eab5d4f524ee7a7ef59f93a0b405 with SHA-1 e99bcf2fa8 is in history

Original change: undetermined

Change-Id: I566354f16b5d04c12e58928ff375183051460617