Merge "Change hwui jank detection to use deadline & gpu completion (1/2)" into...

Merge "Change hwui jank detection to use deadline & gpu completion (1/2)" into sc-dev am: 21142c13

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13562070

Change-Id: If103b9233588dd21c007f608caac598350ef68bf