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

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

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

Change-Id: Ib0bc80109780c03c7d6a4d83382eebf12c083a0c