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

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

Change-Id: I05a0642b469934424439a8984fdea5122f9a0a2d