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

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

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