Merge "Fix cts fail AudioTrackTest#testPlaybackHeadPositionIncrease" am: ac89ed720c

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

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