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

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

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



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