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

Change-Id: Id8a503a6743755ef5a4a532fed0e33fbe6262ef2