[automerger skipped] Merge "Add legacy-align parameter to DmabufHeapAlloc()" am: 66c5a3a3 am: 50ba499c am: 754ef3c2 -s ours am: 950c2cea -s ours

am skip reason: skip tag Change-Id Ic5b49269283caa7d05d9468f8ed7f02e1b3c1f1e with SHA-1 dc398070 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1650823

Change-Id: I89851dfe05ed93ecb6d4b31c1cd1659d63b5af33