Merge "Better control of when MediaCodec has data for mediametrics" into...

Merge "Better control of when MediaCodec has data for mediametrics" into udc-dev am: 5edc02c5 am: 30f66084

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



Change-Id: Ib848a650cb53e9885a5c1ff5707e8be98fa128f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>