[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: e86af42d -s ours

am skip reason: subject contains skip directive

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



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