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

Merge "[automerger skipped] Expand nuplayer mutex for mediametrics management am: 8220d3f7 -s ours am: d95af0cd -s ours am: 6bd78373 -s ours am: 281fd536 -s ours am: f75be02d -s ours am: 9c6b3046 -s ours am: 585bfde6 -s ours" into rvc-qpr-dev-plus-aosp