[automerger skipped] Merge "Fix VideoRenderQualityTracker_test after default...

[automerger skipped] Merge "Fix VideoRenderQualityTracker_test after default is disabled" into main am: 6e7e4e4a am: fe6d3c45 am: 1169b204 -s ours

am skip reason: Merged-In I0912288d0dc15f9dc8b1a9aec1325fe45828f210 with SHA-1 6b8095f4 is already in history

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



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