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

Change-Id: I6abf88fd093db914071c0f3d5710c8e3c8bc0dc4