[automerger skipped] Merge "MediaCodec: propagate usage from original surface to release surface" into rvc-dev am: 68aa6aad3e am: b53fe9f1c8 -s ours

am skip reason: Change-Id If87053e85a3692ed4b5fbc61d45612d5dbf56eb5 with SHA-1 8965b09815 is in history

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

Change-Id: I91cf9ae6ca788a8349cd90f7401bfb9dc3696e23