Merge "Annotated android.hardware.audio.common@2.0 package to prepare for automated"