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: 6d0d5d09

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



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