[automerger skipped] Merge "AudioService: factor out sound effects handling" am: 728c58725e am: 7789e43bd5 am: 5e31724e57
am: d5728dc785 -s ours
am skip reason: change_id I30a7d897d740b02943c68924074f14fae3c3eff8 with SHA1 a1a85a9d29 is in history

Change-Id: Ie7d8e9549b46684c06af5c651968e30417d0157b