Merge "AudioPresentation: Replace @VisibleForTesting with @TestApi" into pi-dev