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 am: 3289f035 -s ours

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

Original change: undetermined

Change-Id: I2c71335e865fa3dbfb7a0ef5a7f3edc565f47a5b