[automerger skipped] Rename T to Tiramisu am: b7d18c309c -s ours am: 7ab52b0dd9 -s ours
am skip reason: Merged-In I6882018a916dc1c71abc442068cb54fb9c42ff3c with SHA-1 ff02f9a70e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15459195
Change-Id: I051b34d3ef0a4417dba49cde8aa93d0026930ae4
This commit is contained in: