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

Change-Id: I37232a10e503887fdd436c4504a53f993da4f1b2