Merge "LockAgent: Refactor violation data"
am: afb660cb49

Change-Id: I735673b6593a377e65d0d3735f7ddc879f961451