Merge "MediaCodec: manage resources for sw video codecs" am: e52c0ff952 am: 936c299d0d

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

Change-Id: I275d911d9f4ad0ddb59bbc80e0d9670d1d6c5d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>