[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: 4edb8ca74c -s ours am: e6586879cb -s ours

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

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

Change-Id: I3f307c6543a5ab9ed49c0aeb669517549fa3a676