Merge "LockAgent: Refactor violation data" am: afb660cb49 am: bea5f08d86 am: 01e03da60a
am: ca374124d0

Change-Id: I3432e17a08c0a76fb3f40f07a880aa9354b6149d