Merge "Do not remove toast window token without removing window" into udc-dev am: 32352058

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



Change-Id: I553c9053aa621038e04b05f25fabecae8adfbab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>