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: 532ec0b2 am: c25893ac am: 5bdb5282

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



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