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 am: 700c67eb

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



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