[automerger skipped] Merge "Expand nuplayer mutex for mediametrics management"...

[automerger skipped] Merge "Expand nuplayer mutex for mediametrics management" into qt-dev am: f9f5f380 am: d7227f1c -s ours am: e25fcf88 -s ours

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

Original change: undetermined

Change-Id: I4857a070d93c533fef046c3e6c1e675830786a13