Merge "Merge "Do not compare ID when deduplicating SecurityEvent" into qt-dev am: 8c10c28673 am: 870c6e846c" into qt-r1-dev-plus-aosp
am: 0d935a2ca8

Change-Id: I73901ff67980a4b89cd6bd247ff11b5455c4009c