Merge "Merge "AudioSystem: add annotation on API used by CTS media" into...
Merge "Merge "AudioSystem: add annotation on API used by CTS media" into rvc-dev am: 3b13f5ef am: 1a533b5f" into rvc-d1-dev-plus-aosp am: 86e343ad
Change-Id: Ie11b1c5f80bd36f84288586b865aa77524a284a5