Merge "CCodec: reorganize max dequeue count update" am: e2eba97ec5 am: dd391024ff

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

Change-Id: I31ad8cd3052df86cba297d2d361a51c1824cb5ac