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

Change-Id: Ia376af78af82b4eca97a98533da3e01418ee8647