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

Change-Id: Ib5a20d8b8aa81260883f4631a00390a819211d09