Merge "Don't count frame drops after resuming from a pause as a video freeze" into main am: c2c7a270 am: c05754d8 am: 72a5714d

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



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