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

Change-Id: If1b989ae3ee0a7222e1313c776be18b72e5b0833