Merge "Don't run comparisons on non-jank frames" am: 903dad812e
am: 4007dd103f

Change-Id: I175e245bd2ced35505a2295f4037c6d9c932f056