[automerger skipped] Skip ab/6749736 in stage. am: 799deac7a8 -s ours am: bea3c7e182 -s ours

am skip reason: Change-Id I19a9de78c0527c7a5dc7d1829474ffef7b977faa with SHA-1 8641f656f9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/libdmabufheap/+/12797481

Change-Id: I95e2e276f1fe7fb97e93fa0ed1f2833b7674c93f
tree: b836131aa302e09a8a8fe129ec9da15dd21a9419
  1. include/
  2. tests/
  3. Android.bp
  4. BufferAllocator.cpp
  5. BufferAllocatorWrapper.cpp