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

Merge "Fix frame duration computations after discontinuities" into udc-dev am: 03ac6df7 am: 3d2d7ee9 am: 79601ca7 am: 5e724ca8

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



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