[automerger skipped] Merge "ACodec: Reduce the TWOmxNode wrapper in GraphicBufferSource" am: 712366758b am: 3be8d0d86e am: c074fe9dc7 -s ours

am skip reason: Change-Id I77ac10d12a15c4b07a37ac7e644400dba85a03a9 with SHA-1 d72eb3f306 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c8bd17108497b71fe5f8796259d77ff621b1c7f