[automerger skipped] Revert "Add UpsideDownCake to aapt2 codenames and android.os.Build" am: 20aacbf012 am: a4299e799f am: 97cb9ab4fd -s ours am: 1485468e05 -s ours
am skip reason: Merged-In Icb6ad340bfea7109aac9b74c6fb5165c030df16c with SHA-1 01018818a3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21524504
Change-Id: I4733ecba9cdae19dae4e4ea0393413ddec5c247f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: