[automerger skipped] Add UpsideDownCake to aapt2 codenames am: 81a9f1a6 -s...

[automerger skipped] Add UpsideDownCake to aapt2 codenames am: 81a9f1a6 -s ours am: 46b79220 -s ours am: 33e8f99d -s ours

am skip reason: Merged-In I2b668d1cd875657b27a1d52bda21f238d7020862 with SHA-1 e422b7da is already in history

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



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