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

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

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