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

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



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