[automerger skipped] Merge "MediaCodec: fix output format change event timing"...

[automerger skipped] Merge "MediaCodec: fix output format change event timing" into rvc-qpr-dev am: a34bbf8b am: f2095d7f -s ours

am skip reason: Change-Id Ib373b71ba65f460edaf82365f8dd9be35348f635 with SHA-1 4a868846 is in history

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

Change-Id: I0620e03fd9f8b0cf853699e44637d5fede6a3234