[automerger skipped] Merge "Fix buffer mapping of BLOB buffers" into main am:...

[automerger skipped] Merge "Fix buffer mapping of BLOB buffers" into main am: 1fc5eb4c am: da2879ae -s ours

am skip reason: Merged-In I368850dba86377252c941b6935a615cb5cfca785 with SHA-1 8d4197ed is already in history

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



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