Merge changes from topic "c2-aidl-fence" into main am: cec0166e am: fc665c00 am: cfde4fa1

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



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