[automerger skipped] Merge "CCodec: fix to check a type of input allocator at...

[automerger skipped] Merge "CCodec: fix to check a type of input allocator at GetCommonAllocatorIds()" into tm-dev am: 07b6cbda -s ours

am skip reason: Merged-In I307e994a6554e7e66a6af2d389fc0834d2c63e2f with SHA-1 1cfdc6b7 is already in history

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

Change-Id: I4a15803ade01f92bf6fc7ec784cf457d356dbab3