[automerger skipped] Merge "Merge "Fix arguments capture in...

[automerger skipped] Merge "Merge "Fix arguments capture in SoundEffectsHelper" into rvc-dev am: cc91c675 am: 7dd9dcc4" into rvc-d1-dev-plus-aosp am: b3504e16 -s ours am: bba787b8 -s ours

am skip reason: Change-Id I2c81b8fa9ae6653da2e6812668395d8fcd6bc6e9 with SHA-1 44f5d3f1 is in history

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

Change-Id: I95e28f4c2b173a55015ccd96e3740b089dad2b66