Merge changes from topic "largeAudioFrame" into main am: 3a4be69c7b am: d521b4dd23

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

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