Merge "Decoder: Fix NPD issue in mmco function" am: f667dbf470 am: e6ea12f22c

Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/1428456

Change-Id: Ifdcc4c49055ad16457b35b087217830a45f1f077