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

Change-Id: I49a590fc18c04add252fefd9e3e4fc07513845bf