[automerger skipped] AudioSystem: add annotation on API used by CTS media am: adcbf9004a am: f8709ba43c -s ours am: 3dbf9b234c -s ours am: 246cde18c4 -s ours
am skip reason: Change-Id Iff9abda2cf971d9c234dcf7df7c2b9a4ad5294c3 with SHA-1 d83e946d53 is in history
Change-Id: I6f8b3370a96e9048888f3098ff8d049537c2a820
This commit is contained in: