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

[automerger skipped] Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build" am: 2a3aa26b am: ff821230 -s ours

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

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



Change-Id: Ib5307e16f1e1dba6ba6e9032cae77e9a58b525cc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>