Merge "C2AllocationGralloc: refactor for media.c2 aidl" into main am:...

Merge "C2AllocationGralloc: refactor for media.c2 aidl" into main am: fdd1d5d6 am: 98fd188c am: 85c0fa78 am: db60addc am: 4087fc84

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



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