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

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

Change-Id: I4353437be47454cb5d91baa102c32af4b0c47367