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

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

Change-Id: Ia1bb7dfe30146be5b1084ed02993979d5be54e2d