Merge "Add TestApi annotation to AudioEffect, AudioFormat, VolumeShaper" into pi-dev
am: 320c1ade67

Change-Id: If871444e0d87171b002bf4b604f2eec08f3a118c