Merge "Improving jank tests diagnostics" into pi-dev
am: 2b28f0699a

Change-Id: I080fbb6778c69b98aa5326be778612e89900684c