Merge "Add KEY_NUM_SLOTS to android.media.MediaFormat" into main am: fc0bd98652 am: cd5ca902af

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

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