Merge "mpeg4dec: Add support for Simple Profile Level 6" am: 44a9fc5691 am: 6eef165f43 am: df71b27432

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

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