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

Change-Id: Ifdbf8391e767476d5e945df01be2c0e6070a24cf