[automerger skipped] Merge "Add support for decoding mpeg4 simple profile level0b clips" into udc-mainline-prod am: 70fcd4b0 -s ours

am skip reason: Merged-In Ifdfec399554d08945c3523a458e9632d2ae85464 with SHA-1 4a09d8e8 is already in history

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



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