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

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

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