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

Change-Id: Ia929d302e93842900d8b9d74891316de17e9edd4