Merge "Remove toast window token after being rate-limited" into sc-v2-dev am: a31d7cd6

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

Change-Id: Id5efb8b1d1f6b0456de7de722e74314965db199c