Merge changes from topic "largeAudioBuffer" into main am: 5a20cf6f7c am: 610f44db26

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2896744

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