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

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

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