Merge "[automerger skipped] Move an orphaned analytics reference under a mutex am: 8e4dd95f57 am: 29709b726f -s ours am: dccdc011fd -s ours am: c31f3ca937 -s ours am: 119fb80e4f -s ours" into rvc-qpr-dev-plus-aosp