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

[automerger skipped] Add UpsideDownCake to aapt2 codenames am: 81a9f1a6 -s ours am: bd8abb87 -s ours am: aef78d6f -s ours am: 742393eb -s ours am: e8fca7a5 -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: I617db81889c49d1455678f95c9016e9601471e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>