Merge "Codec2: fix leaked graphic buffer handles" am: a946fb3a41 am: 1f2608e381 am: 6ca5890b43 am: 3d191bf517

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

Change-Id: I4c263c0f4a7dc1451b7db7ced626a1bb906618f3