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

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



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