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: 2ebfbb89

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



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