Merge "Fix frame duration computations after discontinuities" into udc-dev am:...

Merge "Fix frame duration computations after discontinuities" into udc-dev am: 03ac6df7 am: b88b1d20

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



Change-Id: Icc22d1085ecaf317efbc582208f9f1f15efb2f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>