[automerger skipped] Merge "IAllocator-V2" am: 2d0f8112 am: bc14f0be am: fbf4a3bd -s ours

am skip reason: Merged-In Ifa1ef1a91e7de94d5ad27c846d287d9bbacabd2a with SHA-1 5c7f190f is already in history

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



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