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 am: f363a964

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



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