Merge "AudioPolicyManager:Fix CTS testGaplessMP3AudioTrackOffload fail" into main am: 55f2814b1b

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

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