Merge "ART: Move source owner data to LogContentionEvent" am: a4c90b90f8 am: b099e3cdb6
am: d8bb870f31

Change-Id: I85667dc6433891ae1229a390ff0b107719e50f73