Merge "Merge "MediaUtils: Add ScopedStatistics for effect tuning" into tm-dev am: 70142153ea am: ae42d91674" into tm-d1-dev-plus-aosp am: b184fd6436

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

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