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