Merge "[automerger skipped] Move an orphaned analytics reference under a mutex...

Merge "[automerger skipped] Move an orphaned analytics reference under a mutex am: 8e4dd95f am: 29709b72 -s ours am: dccdc011 -s ours am: c31f3ca9 -s ours am: 119fb80e -s ours" into rvc-qpr-dev-plus-aosp am: 23348275 -s ours

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

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

Change-Id: I0a27cb4d9bbf7f805d1e72e9f18ce595ff7ed2c3