Merge "Fix direct/offload AudoTrack playback head position on flush & re-use" am: 1494f05cc3 am: 30127284d0

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

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