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

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

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