Merge "mpeg4 decoder: Enable support for quant_type 1" am: 2b172d333f am: ca937cbcf8 am: 3326fe81e3

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

Change-Id: I7218660726608c6aa9191a40e338379cab1bf3c5