Merge "ART: Change contention logging lock strategy" am: 721276bf92 am: abf9a667cf am: 15674118a3
am: dbf737a0d0

Change-Id: I6a1f8ac97e812408aa03c0094eaa5c81f339cc10