Merge "Fix frame duration computations after discontinuities" into udc-dev am: 03ac6df71a am: 0afa734914

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

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