Merge "ART: Change contention logging lock strategy"
am: 721276bf92

Change-Id: I579b7d8575b85b83e485366f4586265f9e913cca