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