[automerger skipped] Merge "Refactor SoundEffectsHelper for asynchronous loading" am: 70532e5231 am: d10d68dec1 am: 92b359b57b
am: 0cfd591421 -s ours
am skip reason: change_id Ie5a1684a2cabe05ff53270ad97cab161a87a59f9 with SHA1 251c595896 is in history

Change-Id: Ibdfca3c9ab87c818785382a1d508d65c8ac67e5e