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

Change-Id: I003724689cb66431b74349c9555357665e70fbc1