Merge "Remove Tiramisu codename from branches downstream of tm-dev" into...

Merge "Remove Tiramisu codename from branches downstream of tm-dev" into tm-dev-plus-aosp am: ca221eb1

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18799232



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