Merge "MediaCodec: describe bundle keys for onMetricsFlushed callback" into...

Merge "MediaCodec: describe bundle keys for onMetricsFlushed callback" into main am: 2f54c684 am: 6ff0a7fd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3437059



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