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