[automerger skipped] Merge "Move allocator-V1 entry" am: b2c0b2d6 am:...

[automerger skipped] Merge "Move allocator-V1 entry" am: b2c0b2d6 am: 3d81281f am: a21d947b -s ours

am skip reason: Merged-In Id68e4ef3b38965c08c9b783d32ccc2aca342ed24 with SHA-1 ba2dfa88 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2305882



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