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: I95a72cd9f1c1a0d9801a2fbd67ffd1a98d299129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>