Merge "Fix flaky AnalytisTest by locking in EventRecord"
am: 0a390095df

Change-Id: I81001dc60def2165a8083a457559ec2ea1548d91