Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build" am: 2a3aa26b06

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

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