[automerger skipped] Merge "Support AIDL BufferPool from BlockPool" into main...

[automerger skipped] Merge "Support AIDL BufferPool from BlockPool" into main am: 098db221 am: c77c62bf -s ours

am skip reason: Merged-In I7dc60172038cda691a5322266b1ee860733101a9 with SHA-1 92573a2d is already in history

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



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