Merge "C2AllocationGralloc: refactor for media.c2 aidl" into main am: fdd1d5d685 am: 98fd188c91 am: 85c0fa7862 am: db60addc72

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

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