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

[automerger skipped] Revert "Add UpsideDownCake to aapt2 codenames and android.os.Build" am: 20aacbf0 am: fd329dda -s ours am: 5ae3eca4 -s ours am: a83a41ca -s ours

am skip reason: Merged-In Icb6ad340bfea7109aac9b74c6fb5165c030df16c with SHA-1 01018818 is already in history

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



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