[automerger skipped] Add VanillaIceCream to aapt2 codenames am: 1dd09eb7 am:...

[automerger skipped] Add VanillaIceCream to aapt2 codenames am: 1dd09eb7 am: 7dc9b3e8 am: 2095f087 -s ours

am skip reason: Merged-In Ia8bd807ab25260ff6716e2aea36e4d3e8567eb22 with SHA-1 a0029778 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2558930



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