Merge "Update transient-flags when windows are collected" into udc-dev am:...

Merge "Update transient-flags when windows are collected" into udc-dev am: 7f7fd82c am: fdcb75c7

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



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