Merge "Merge "MediaUtils: Add ScopedStatistics for effect tuning" into tm-dev...

Merge "Merge "MediaUtils: Add ScopedStatistics for effect tuning" into tm-dev am: 70142153 am: ae42d916" into tm-d1-dev-plus-aosp am: b184fd64 am: 3309abce

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



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