Merge "C2SoftMpeg4Enc: Add support for levels in mpeg4/h263 encoder" am: 61e0b54786 am: 668777054b am: a45fad9f58

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2522015

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