Merge "AudioService: factor out sound effects handling" am: 728c58725e
am: 7789e43bd5

Change-Id: I9c745c542541176cc81586863b4045ac1ad1a6c5