Merge "SF: fix displayDeadlineDeltas and displayPresentDeltas histogram" into sc-dev am: fe9d6fd179 am: 6d05d2013f

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

Change-Id: I39cf22b6c42bf65c9cc44114955e00f203361159