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

Change-Id: Ie6fc2e1966af1a6017b15f9880ec3933467aadaf