Merge "Adding MediaFormat keys for large frame audio" into main am: 434ecac6b4

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

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