[automerger skipped] Merge "Rename T to Tiramisu" am: 318e6456 -s ours am:...

[automerger skipped] Merge "Rename T to Tiramisu" am: 318e6456 -s ours am: 1b30d0ef -s ours am: 26c8b0b7 -s ours

am skip reason: Merged-In I6882018a916dc1c71abc442068cb54fb9c42ff3c with SHA-1 b7d18c30 is already in history

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

Change-Id: Ie36b6c6968cefcb8bd691b4baa324ac432e6b3f2