[automerger skipped] Updates to audiotrack tests am: 46798222 am: 97f03706...

[automerger skipped] Updates to audiotrack tests am: 46798222 am: 97f03706 am: 521022d2 am: c4dd3933 am: d1ce00c9 -s ours

am skip reason: Merged-In I5530dfe46e8b63121206027ce03b93d92bc51ec1 with SHA-1 2c2a1008 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2190009



Change-Id: I8891060729bf14b2a17cff2067dcfc9118163276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>