[automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when...

[automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into sc-dev am: d829ed59 -s ours am: beb1c7f0 -s ours am: bc99d2b4 -s ours am: 55cce39a -s ours am: 5434590a -s ours am: 5634847e -s ours

am skip reason: subject contains skip directive

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



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