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: 04023cb2 am: aa7693bb

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



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