[automerger skipped] Rename T to Tiramisu am: b7d18c30 -s ours am:...

[automerger skipped] Rename T to Tiramisu am: b7d18c30 -s ours am: 7ab52b0d -s ours am: fb96be1e -s ours

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

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

Change-Id: I895f7e8e3a0cdd8c7fa53dc38711de1cbe00b3c8