Merge "AudioTrackSurroundTest: Stopped using resources in apk" am: 2e65d29443

Original change: https://android-review.googlesource.com/c/platform/cts/+/1431793

Change-Id: I98130c6759f0b3d641156208dc6f1956ca4ded90