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

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

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