Merge "Do not remove toast window token without removing window" into udc-dev...

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

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



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