[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 52b1b964d5 -s ours am: 937344cd8c -s ours am: 3fc5778165 -s ours

am skip reason: Change-Id I5a4421f655e17fbf76e0a0a8a17a9b2a5adef939 with SHA-1 494fff0c09 is in history

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

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