Merge "RELAND CCodec: don't drop metadata for output with flag FLAG_DROP_FRAME." am: 160e69bf8e am: 04abbff9d0

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

Change-Id: I027268262e77feccadd7786f9a74b83f1311f140