[automerger skipped] Merge "Merge "Rename T to Tiramisu" into sc-dev-plus-aosp am: 001565f2a5" into sc-v2-dev-plus-aosp am: f50fbb9ad3 -s ours
am skip reason: Merged-In I6882018a916dc1c71abc442068cb54fb9c42ff3c with SHA-1 767684f3e0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340845
Change-Id: If48759dca074fda9007fb71b5b97f3a9c5f8118f
This commit is contained in: