Merge "AudioService: add TEST_MAPPING for pre-submit tests" am: 5620ad16b9 am: 4f13a62b6d
am: 3839be4e4f

Change-Id: I67cc40e7022c21f18d8b89d7defca59ee6d822fc