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

Change-Id: Ifa04c8d827c3ce9c34454115fcb45ed092377dda