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

Change-Id: I3b75a28876b8e9f4d110df2c7f9e6019a49d44b2