Merge "Don't count frame drops after resuming from a pause as a video freeze"...

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

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



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