Merge "Fix test name for Atrace 1.0" into qt-dev
am: 5220748d62

Change-Id: I04465cdb3dec82af30808c21b3b372c1d3a5b99e