Merge "Process skipped frames the correct order, per content time" into main am: 23e9c3916b

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

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