Merge "Decoder: Fix NPD issue in mmco function" am: f667dbf470 am: e6ea12f22c am: 6913c3db5b am: 8633b1b51a

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

Change-Id: Id1e6e627983bcee16c54cdfb6050b5e30f11da7f