[automerger skipped] Add UpsideDownCake to aapt2 codenames and...

[automerger skipped] Add UpsideDownCake to aapt2 codenames and android.os.Build am: e422b7da am: 748236fd am: 0a605602 -s ours

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

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



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