[automerger skipped] Merge "AudioService: add TEST_MAPPING for pre-submit tests" am: 5620ad16b9 am: 4f13a62b6d am: 3839be4e4f
am: b435a057b7 -s ours
am skip reason: change_id I17a49fad6856ae28ef1951d64a43b04f44be4079 with SHA1 b08ff67e40 is in history

Change-Id: Id01c499b15c5ee44e55820416c6e5cd51fcf8d71