Merge "mpeg4dec: Add support for Simple Profile Level 6" am: 44a9fc56 am:...

Merge "mpeg4dec: Add support for Simple Profile Level 6" am: 44a9fc56 am: 6eef165f am: df71b274 am: 5de904dd am: a5c8f26b am: 87279b35

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



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