Merge "Fix VideoRenderQualityTracker_test after default is disabled" into main am: 6e7e4e4a78 am: 174a191ab2

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

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